From: Jim Fehlig <jfehlig@novell.com>
Date: Tue, 18 Jan 2011 17:20:55 +0000 (+0000)
Subject: xend: drbd: Revert 19444:152257350930
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=94182843973828ec589e2efc9b65ec013c6caf58;p=xen.git

xend: drbd: Revert 19444:152257350930

Remove some more "drbd" cruft from xend.  This is not necessary for
drbd to work with Xen.

Requested-by: Jim Fehlig <jfehlig@novell.com>
Tested-by: Shriram Rajagopalan <rshriram@gmail.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/tools/python/xen/util/blkif.py b/tools/python/xen/util/blkif.py
index d68423c4c3..3fc54e79cd 100644
--- a/tools/python/xen/util/blkif.py
+++ b/tools/python/xen/util/blkif.py
@@ -71,7 +71,7 @@ def _parse_uname(uname):
     if uname.find(":") != -1:
         (typ, fn) = uname.split(":", 1)
 
-        if typ in ("phy", "drbd") and not fn.startswith("/"):
+        if typ in ("phy") and not fn.startswith("/"):
             fn = "/dev/%s" %(fn,)
                
         if typ in ("tap", "tap2"):